Created more portals; updated logic