Improved goto variable