Revised for portal changes