Improved how debut on entry works