Updated based on slack feedback