Big version logic update part 1