all main changes and editing done