add security warning, remove conditional MUST