Update the 0CFA draft with lots and lots of 's' type params