Better place to return, plus data migration