Updates by Wilmar