Moved to less magic files passing