FIX: changed API to reflect new changes in last commit