Some modification added by advice