made some hefty changes