added some awesome changes