BugFix-Bhavesh /changes

Including 05/01 termination