Add new version, Uses one class instead of 4