Updated with latest version of Portal and Chaoslib