bit of a clearout...2 set ups, 1 mod

completed