add status message and some logic changes