Changes to create word waves and proper stream usage