Improved encore-mode