security commit (work in progress)