Oh doh, fixing the problems which arise due to changes in order of operations.