[CT-*] Improved blocks model