implemented suggestions of Henry