Improve behavior