A variant that should work without added features