Improvments for Choregie