Also re-order conditions so that preposition test passes
Attach a file by drag & drop or click to upload
