Soft code config
Merge branch 'brian'