more modifications

more modifications