add commented-out code back in