Incorporating some suggestions from Steve