Ading 2 new types of analysis (Jens)