orig logic commented for the time being