Modified not to use __DIR__ syntax