Made portals less hacky