Improve bird tool