Futher efficiency improvements