Update to work with new teleport system