Self security (18/35)

Self security