Adding credits to Ying and Thien