Updated with "running" file support