Included suggestions from Max