adding lab 5, cleanig everything else