Changed to Peter and mac environment