added utilities, improved track structure