Improve away command and two tc's