Updated based on PR feedback