opitimizing on shelf, temp commit