Updates by Naldeo