Added back original defaults