now using upstream plugin