refactored with environment var
Merge branch 'bblocal'