Tighten requirements