Updating base code of 14 march 2014