Improved lab 3.2