Changed up some things to make testing easier