Updated to fix Portal issues