update for security refactor