Added Brendon's changes