added some configuration setup