all main changes made