Adding in the version classes
Some changes to methods