With graph some chnages