Sync

Sync with Hector's version.