Added a bunch of logic / code comparison