Added some extra echo statements.