add public and server