This paper presents the tracking system from Athens Information Technology that participated to the pedestrian and vehicle surveillance task of the CLEAR 2007 evaluations and the obtained results. The system is based on the CLEAR 2006 one, with some important modifications that are detailed. Since the test data in CLEAR 2006 and 2007 are the same, it is easy to quantify the obtained performance gain from the older system to the proposed one.