updated server controller