more changes for new server
last commit before temp shutdown