Tenatively merged Derrikes changes