Updated based on recent feedback