Woah! you can't just change the whole accuracy system with no discussion.
Revert this and PR separately.