add commented out code back MJ-682