working on fixing issues 3