Reverted to Production Version from Example Code