more code safety