Switch from matrix, performance has already gone to the dogs so make it readable!