feature update
Fully use 'real' clientId's now