Better solution for E29