Made john all caps and added a conditional
Fixed merge conflict.