#13 Validation and version upgrade logic changed.