20130509 - Alan's changes for timing analysis