Resolved merge issues with amit branch