Added GOTOs (!?!)