new migration 2 and 3