Adding in Mark Stiles additions