Finish the server need checks