Rebase a bit more brief, still needs improvement.