added a few blocks and renamed collector