changes on drawing and server