improving usecases