Pull Urigo's changes