additional enhancements for the user experience - View it on GitHub