Complete Scoundrel updates that I thought I committed - :-(