added more awesome changes