AWS modification v1.5