Merge Monty (with formatting fixes)