changes to allow server reset