fixed and added use cases