Before adding nondimensionalization option