Added more echo statements