updated server class