added track and mode selection