Improved by using a handy method