Added Tim's controller support