Updates by Framiore