adding some modifications