There’s been a lot of speculation about how, or if, Comic-Con International would be changing their costume prop policy this year, particularly after an incident at Phoenix Comicon where a man carrying multiple guns and knives was arrested, and all costume props were banned (at least temporarily).

However, it’s good news for cosplayers at San Diego this year, as CCI has taken a different approach. The main change this year? They’ll be adding a second Costume Props Desk near the outside door in the lobby of Hall C2. This change should help both ensure that no costume prop is left un-checked, and that cosplayers aren’t waiting in lengthy lines.

As in years past, no functional props or weapons are allowed — and all costume props must be inspected at one of the two Costume Props Desks (the other one is located in the lobby of Hall E). Costume swords must be tied to your costume in a way that they can’t be drawn, but it doesn’t mention anything about the zip-ties that were being used for several days last year for all costume props.

Here’s the full updated Costume Props Policy, which you can find on CCI’s site:

No functional props or weapons are allowed at Comic-Con. Simulated or costume weapons are allowed as a part of your costume, subject to prior approval by security and compliance with the following:

All costume props and weapons must be inspected at the Costume Props Desk, located near the outside door in the lobby of Hall E.

New for 2017: A second Costume Props Desk has been added near the outside door in the lobby of Hall C2.

All costume props and weapons must conform to state and federal law.

Projectile costume props and weapons must be rendered inoperable.

Functional (real) arrows must have their tips removed and be bundled and zip-tied to a quiver.

Costume swords must be tied to your costume in such a way that they can’t be drawn.

Costumes featuring stilts must be approved at the Costume Props Desk.

At certain times, due to crowds and safety issues, people in oversized costumes may be asked to leave the Exhibit Hall.

After your costume props have been checked, they will be tagged by security, and you will be given a wristband to wear to designate that your props have been checked.

Security will escort you to the Costume Props Desk for inspection if your costume prop is not tagged.

If you do not want to have your costume props inspected or tagged, or if you are not willing to comply with these policies, please do not bring your costume props to Comic-Con. All costume props and weapons must be inspected at the Costume Props Desk.