cleaning up following osse's advice.