added back reverted changes on 1st PR

- Added back reverted changes on 1st PR
- added note to help identify changes on 2nd PR