Complete version updated