Updated for Catbox 3.x