making last few changes for use case