working on fixing issues 2