Changes to make it run anywhere