re usecase, some changes...