reverting back last commit

Last commit brought some more issues!!