Nicholas' fixes Jimmy's errors