added in file pieces and blocks
merged