initial check in server 1.6