Removed debuging echo statements