Please review branch feature/fix_thresholds