update with Rossa's corrections