Ported to newest version of Choco beta.