Updated for QuickBlock