Change beginning to be shorter warm-up