Updating links and adding Macaw example