lab 2-reworked