improve track support