Fixed errors Part 2