Added tracking controller