Updates by Graziamrk