Reverted to Peter's version of the use case