Updated feature to reflect latest code on production