different fixes in step 2