Removed blocking action to prevent this from running on every load