Some updates step 2 far from perfect