Field Event Warm-up Times Besides Vertical Jumps

As of right now, there is a 20 minute general warm-up period, then followed by a 10 minute flight specific warm-up for each flight and then also for finals.
I believe doing a 15 minute general warm-up period, then a 15 minute flight specific warm-up for each flight and then for finals also.

Amended to: For National Championship meets, eliminate general warm-up period, and add a 20-minute flight specific warm-up period for each flight, as well as a 20-minute warm-up period for finals.