Including Nick's commits