still fixing previous