Blocker working again with 2D improvements.