Testing
updated server-all class