updated to role vars