Better track alignment