Ping @GeeH - does this answer your question? or are further changes needed?