Self validating (24/25)

Self validating