Improve Complexity