new aliases, diff algorithm changed