Improved slot behaviour