should be fine to fix everything from here in