Bug fixes plus defence revert to original