Even better archiving
More
Removed some stuff for Johnny