Changed the fors with block enumaration