fix subs, add cancel