Refactor
Duress support on room