server side changes for LS to work