Location no longer hardcoded