changes to reflect the server system