new architecture. fix in dependency