Changed exit & trab behaviour