I'm +1 for getting rid of this complicated coding.