Add terminating conditions and user feedback