modify for quick 2.x framework