Updated for catalyst portal