Updated to match AWS web site changes