Updates by Verutek