Started tweaking to match Pauls work thusfar