#3 fixed bugs part 2