Made some modifications

Modifications