Code merge Modifications