enhancements for new viva cal