changes before AWS