last commit before I take out TBar controller