added name stuff