M1 for Server

Review the code.