updated friendlydragon - works up to the dragon now