added configuration stuff