reverting back
fixes and updates