Made it work for local deployment