New API and working on J3.1