Updates by Tai & Chyun