wip! rugged diff