See comments in files.
Proper status update