#6 #9 #7 some server code and change in interface