updated existing formulae to new specs, added noice