Updated file-access and scripts