Updated specs and calculator