Made changes to our code to make it simple