Self secure (8/23)

Self secure