still working on fixes