Updates based on Barts feedback