'updated with less logging'