modified something
compled enumerable with test and everything