updated to contain fullpath