Improved teleport efficiency

Improved teleport efficiency