Optimize a little bit more