added changes to server class, to fit in out model...