improved migration scripts in preparation for AW