ThoMo framework added (again)