merged conflicts; added L2 cache switch