now have it working with names