almost fixed up