adding config checks
work in progress
adding another set of changes