fixed lab1 1.5 and 1.7