more changes to pass the flow-down rule