added fixed blocks
merged conflicts