merging in changes "queued" up for after Davis