Bring in goneri's changes