Self validating (9/25)

Self validating