Removed some changes I made that were not helpful