Better solution now.