Teleport revamp