- some trim: about 20 sec reduce? --- removed "all files" level value returns and replaced them with references.