Updated Macaw, and made it easier to update