WIP， try to unblock actual usage