Update

Simplify server