integrate envelope model and ui additions