Some changes necessary after testing this on another machine