Option A improvement & improved function parm name

Option A has more code in it now. Also the function no longer has a
parameter called time which is less confusing.