added more server functionality