Updates by Noor Vizhe