improved version-tracking