Polished up timing and design for matching