Improve complexity