Updated for Canto II