Macaw update for better writing