Added naive tracker