Handler now moves within parent container