Adding some awesome changes