Updated find to the new format