many small changes to use case