Changes based on MarkB comments