move handlers to after src