simplify code and add back archiving