code refactoring; some files want to be attached