Modifications done on 23-07-2014