AWS modification v1.6