Made some modifications