changed for euans suggestions