archiv update, refactoring