Fixed AWS Take 3