updated for happy path/sad path