Improved analysis