Updated based on feedback from Scott