some updates for smoother experimentation