Correctness: 0 - Angry users: 1.
Also use new shiny architecture specific source arrays :)