oh dear me - rebase corrections