updated with 10/21 content