JC: revised migration again for review.