A lot of input from Michael applied - made it more consistent!