trying to fix issues - might have to discard this commit