Improved Glass2