I thought this was simpler. I don't mind if you want me to revert this.