Changes to formulae based on advice of adamv