preparing migration to 3.3