Delete system added.
Lots of changes.