Added ability to take full name