Updated code as on FEB15th-620pm