I made some awesome changes

Review it please