Much, much simpler.

Will have to remove the old crap soon.