2.1hr calcs modularized and improving