Continue switch to using blocks in generator