update from knightingal