added fake tracking(key control)
resolved conflicts