Monstro: more optimization