Optimization and improvements.