fixed all the required changes