Updates based on suggestions from Niall