more changes to usecase