added configuration code