Fixed Colin's errors