Improved the motivation feature