End of checkpoint.
Refactored user names and captions