Add echo statements