changed my mind on some improvements