lots and lots of changes, lots for the numerical section