#336 - commented out section until feature 'go live'