used OOP approach
Fixed certain changes suggested, also added back the previous fix messages
removed
Fixed