Incorpoating feedback from domenic.