Fixed bug, finished part 2