doing a bit more rebasing now