AWS modification v1.4