recommitted SpyGlass changes by ishi