passes QA tests and added support for local config