Step 1 works again as expected, lots of changes