Nail: Committing Michael's changes