merge in changes from Bryan