Removed RE for compatibility, investigate into speed further