Verison 2 Additional Changes