updated with architecture