more role and logic adds