Modified bugs on step 2