Added name check and face check