some changes away from paddys data