bring in changes from 11/23 as 11/30
merging code from github