very early g+ work and testing fix