Improved player behaviour