making some modifications