fixing my 2 use cases