Address feedback raised from experience demo