Got tired of checking orgId