Partially edited step 3 to work with new data model