thomascampi - Final adjustments