merged changes from chad branch