update changes from Hieu's script last week