Now up-to-date with Chris' most recent changes