Made it Sam-compatible.