updated transition timings and updated templates