add chaos_calmer branch