now with extra cleverness