Added untrack and commands