Updates by Niras