Add notes from @fperez