restructured a couple things