Improved behavior