Fixed up code, using or instead of and, pretty fail on the logic