Adapted recommended policy
Include umit's part, actually