improved experiment architecture