Changed API slightly.
Had to merge changes, weird.