modified a couple things