updated after 8/25 feedback