Tighten up requirements