Merge in changes from Dan's updates