Updated based on feedback from Karl