Now works with old settings