Pulling in Bens code updates