Slight refator at showing the status updates
Merge to master