This patch implenets the modifications required by the previous patch and
and makes the required internal adjustements