updates based on feedback from PHK and JG