Added zap_carrage_returns