increasing setup personalization and flexibility (v2)