Fixed the portal thing maybe
Auto merge