Updates by Novandie