after rfums visit, many changes