working on fixing issues