Added and tested re-timing methods