Updated based on discussion