update cms and improve tracking system