added control buttons support