Changes in Client logic & GUI admin