Refactoring Success Case

I have refactored the code so that it will work with
non-root accounts.