2nd commit to Amazon changes