Few conf changes - this version is not working properly...