New API, test included