removed the unwanted code and added the required fields