debuggin new changes 1.0