added reqire
changes from live and my local inc oath2 and exception