migration step 1 : working version