Final round of changes

all but moving n timing and placement method from step 3 to 4.