Tom's second Dec 14 commits