first modification by norain