Updated for alpha11. Added block code
Fixing conflicts