Re-add return statements to fix bug where vicinity wouldn't load