Upgraded to onejs v3