improved experiment setup