Updated client and server side