Maked better new configuration