Updates based on feedback from Bart