Updating mock to use more BKT formulae