Reverted to use older API method here