AWS modification v1.3