added some server methods
fixed merge conflict