Big changes on track generation & render