Added ripples and manage data validation