implemented new file format
use more IEnumerable's