Fix my stupid merge of Scotts branch