suggestions from Andrew