added vol eqn, changed main