Derp rebase part 2