making way for new role system