[Laptop] Structural changes, Matrices additions