Some adjustments, I hope there is nothing missing.