Improve condition
Add some feedback messages
Change order of tasks