Few new modifications