adjuested configuration
futher changes