The ugliest code I've ever seen - now more visible