Super block

Merging changes in SuperBlock