Adding sanity checks and removing random original version numbering