Updated client-side