Updates by Ngp