Made one last change for directory independency