add tracker and demo