Created new methods to use on the server and client