still fixing more