Client requested feature update

The client has asked for this feature to be updated, please review and accept as appropriate