Improved complexity