lots of changes to stucco, new roles