Latest revision - making sure everything is coherent