Starting to phase out one of the calculator methods