second commit of John Cruise