Added extra echo statements