Incorporating suggestions from Steve