Updates by Symvaro