Fixed Niamh's mistakes