Portal two work (#1357)