Added some quick changes