move tracking to patch controller