Updates by Cla-Val