Updated with latest version of Portal