Improve step 1