missed a few changes in prev commit