added support for individual names etc..