Lab2 restructured