new metrc calcualtions added