added conditional blocks. No generator yet