Updated to Reflect new changes

Updated to Reflect new changes, and conf settings.