more changes to use case