Martin Yde - Changed config setup