Changes by rubini