fixing as i go, yes tim