still fixing there and that