Updated to fix Portal Issues