updates to allow more configuration;