improving flow, added messages