Add notes from Andreas