need to fix tracking