Added status message and new logic