Made tracks better