some changes in use case scenarios