migrate changes to support AWS changes October 2014