pull in travis's changes for October week 3