some modifications

some modifications