added control for names