Now always runs clean
Synced up with the repository