Please review branch feature/thresholds