Pi -> pi2 migration