Time for merge from Tom...