Changed data management for step 1 and 2