Updated Feature tracking