Incorporating feedback from Hallvord