Working on fixing up this boolean issue