Fix cumulative error on drag
Update API to new style