Updated client controller