Re-arranged 2. and 3. chapters