Readd chris's code.. taken from most recent git hub