No useless wake up and simplify. Fix a few race conditions with deactivation.
Attach a file by drag & drop or click to upload
