Correct-style versioning, attempt 2