execution mode selection improved