enhancements for new viva cal 2