added name checks