Added debugging (v3.0)