Changes by Alex for client-server business logic