Changes to make it work anywhere