update to reflect the latest architecture