Changed some thresholds, timer not working yet.