This logic got decidedly more complex as well, could we add a comment or two?