initial architecture overhaul