Changes from scrooge project