Trev's changes 1