updated config method
merged master