Cleanup
Introducing a security busy flag to avoid recursive update