More efficiency improvements