Added line
Removed Empty Block
Renamed context blocks to match actual codepath