refactoring some arch stuff.