added some controller support