Changing some of the features I did not like