Done! You're right, it is simpler.