added track/master code