some reverts. duplication bugs, still unresolvable.