Adding some awesome changes..