made some big initial changes