Updates by TMVW