new changes to be commited
new changes as of 17th jan 2014