merge all changes from up stream (changes made by Grant and Alex)

Sept. 30