more optimizations
change version