archiving added and some clean up