Better solution...