Improved stargate behavior