reverted some commits which should'nt have been done