[PATCH v3 0/8] Updated based on feedback