demo changes for no server situations