Brought client side into more line with server