Some improvements, nothing major
Lab 8 ready