changed roletaking mechanism