some optimizations
One more build