Made some awesome changes