changed the server api to match the client one for better consistency