using config variables
minor changes