migration to 3.5