Improve conversion tracking

Change this to use the correct mode.