incorporate Rossa's corrections