Previous code was horribly wrong.