Some modificication