Removed end_play condition