Changes to ensure Macademia works!