change timing, add imports