Updated Step 1 for all use cases