Updates by christoo