Added a lot more user feedback