Updated experiment setup