Updated usage
This is the API I want
Reverted logic to Q