Added console/player check