Optimize further