Reupdated thresholds once more
Cleanup threshold methods