added changes from master config