changed use cases and names as requested by customer