r3 - Version detection added