some finer details changed [Mark Doss]