prepare to change to new server logic