Updates by Kueste