consolidating some files, added an intermediate step