Refactored as per Abi