changes from main server