Use the returned datechanged instead

Fixes/closes 
- #2125 
- #2114 
- #2152