improve custom execution