Fixed Brendan's mistakes