Even more improved encore-mode